bitkeeper revision 1.1705.1.13 (42a99a6dV4rHEyZ-t7znDZXeW50z5Q)

Some functions of xenstore library dont have xs_ as prefix. This patch
fixes the problem.
Signed-off-by: Nguyen Anh Quynh <aquynh@gmail.com>

diff --git a/tools/xenstore/fake_libxc.c b/tools/xenstore/fake_libxc.c
index decfb4001ded3e78b1cfc3470b12ae437a7e1227..50e1db717c4cb929e63d98416b470de5041e0030 100644 (file)
--- a/tools/xenstore/fake_libxc.c
+++ b/tools/xenstore/fake_libxc.c
@@ -71,7 +71,7 @@ int xc_interface_open(void)
                return fd;
 
        memset(page, 0, sizeof(page));
-       if (!write_all(fd, page, sizeof(page)))
+       if (!xs_write_all(fd, page, sizeof(page)))
                barf_perror("Failed to write /tmp/xcmap page");
        
        return fd;

diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c
index 9d15848463cb4ceea70814242c73964e9a86394d..b1ce20a554fbb6015a2cf91b1083ddc2e1a63f75 100644 (file)
--- a/tools/xenstore/xenstored_core.c
+++ b/tools/xenstore/xenstored_core.c
@@ -81,7 +81,7 @@ bool test_write_all(int fd, void *contents, unsigned int len)
                errno = ENOSPC;
                return false;
        }
-       return write_all(fd, contents, len);
+       return xs_write_all(fd, contents, len);
 }
 
 int test_mkdir(const char *dir, int perms);
@@ -443,9 +443,9 @@ static struct xs_permissions *get_perms(struct transaction *transaction,
        if (!strings)
                return NULL;
 
-       *num = count_strings(strings, size);
+       *num = xs_count_strings(strings, size);
        ret = talloc_array(node, struct xs_permissions, *num);
-       if (!strings_to_perms(ret, *num, strings))
+       if (!xs_strings_to_perms(ret, *num, strings))
                corrupt(NULL, "Permissions corrupt for %s", node);
 
        return ret;
@@ -460,7 +460,7 @@ static char *perms_to_strings(const char *node,
        char buffer[MAX_STRLEN(domid_t) + 1];
 
        for (*len = 0, i = 0; i < num; i++) {
-               if (!perm_to_string(&perms[i], buffer))
+               if (!xs_perm_to_string(&perms[i], buffer))
                        return NULL;
 
                strings = talloc_realloc(node, strings, char,
@@ -506,7 +506,7 @@ static char *tempfile(const char *path, void *contents, unsigned int len)
        if (!fd)
                return NULL;
        talloc_set_destructor(tmppath, destroy_path);
-       if (!write_all(*fd, contents, len))
+       if (!xs_write_all(*fd, contents, len))
                return NULL;
 
        return tmppath;
@@ -721,14 +721,14 @@ static bool new_directory(struct connection *conn,
        permstr = perms_to_strings(dir, &perms, 1, &len);
        fd = talloc_open(node_permfile(conn->transaction, node),
                         O_WRONLY|O_CREAT|O_EXCL, 0640);
-       if (!fd || !write_all(*fd, permstr, len))
+       if (!fd || !xs_write_all(*fd, permstr, len))
                return false;
 
        if (data) {
                char *datapath = node_datafile(conn->transaction, node);
 
                fd = talloc_open(datapath, O_WRONLY|O_CREAT|O_EXCL, 0640);
-               if (!fd || !write_all(*fd, data, datalen))
+               if (!fd || !xs_write_all(*fd, data, datalen))
                        return false;
        }
 
@@ -878,7 +878,7 @@ static bool do_set_perms(struct connection *conn, struct buffered_data *in)
        char *node;
        struct xs_permissions *perms;
 
-       num = count_strings(in->buffer, in->used);
+       num = xs_count_strings(in->buffer, in->used);
        if (num < 2)
                return send_error(conn, EINVAL);
 
@@ -898,7 +898,7 @@ static bool do_set_perms(struct connection *conn, struct buffered_data *in)
                return send_error(conn, errno);
 
        perms = talloc_array(node, struct xs_permissions, num);
-       if (!strings_to_perms(perms, num, in->buffer))
+       if (!xs_strings_to_perms(perms, num, in->buffer))
                return send_error(conn, errno);
 
        if (!set_perms(conn->transaction, node, perms, num))

diff --git a/tools/xenstore/xenstored_test.h b/tools/xenstore/xenstored_test.h
index f173a5ca9101ea7f7f9b6a52c96f25646628f5fe..cf607cf2e0fcbdfce604fa7b77d15753eaa0c7f5 100644 (file)
--- a/tools/xenstore/xenstored_test.h
+++ b/tools/xenstore/xenstored_test.h
@@ -21,7 +21,7 @@
 
 #ifdef TESTING
 bool test_write_all(int fd, void *contents, unsigned int len);
-#define write_all test_write_all
+#define xs_write_all test_write_all
 
 int test_mkdir(const char *dir, int perms);
 #define mkdir test_mkdir

diff --git a/tools/xenstore/xs.c b/tools/xenstore/xs.c
index d5058abfb3b6ffade5080501b53e062c8a6d075d..d6e41380f9b5df92d05ad83802b12e205ccadf8a 100644 (file)
--- a/tools/xenstore/xs.c
+++ b/tools/xenstore/xs.c
@@ -118,7 +118,7 @@ static bool read_all(int fd, void *data, unsigned int len)
 
 #ifdef XSTEST
 #define read_all read_all_choice
-#define write_all write_all_choice
+#define xs_write_all write_all_choice
 #endif
 
 static int get_error(const char *errorstring)
@@ -179,11 +179,11 @@ static void *xs_talkv(struct xs_handle *h, enum xsd_sockmsg_type type,
        ignorepipe.sa_flags = 0;
        sigaction(SIGPIPE, &ignorepipe, &oldact);
 
-       if (!write_all(h->fd, &msg, sizeof(msg)))
+       if (!xs_write_all(h->fd, &msg, sizeof(msg)))
                goto fail;
 
        for (i = 0; i < num_vecs; i++)
-               if (!write_all(h->fd, iovec[i].iov_base, iovec[i].iov_len))
+               if (!xs_write_all(h->fd, iovec[i].iov_base, iovec[i].iov_len))
                        goto fail;
 
        /* Watches can have fired before reply comes: daemon detects
@@ -253,7 +253,7 @@ char **xs_directory(struct xs_handle *h, const char *path, unsigned int *num)
                return NULL;
 
        /* Count the strings. */
-       *num = count_strings(strings, len);
+       *num = xs_count_strings(strings, len);
 
        /* Transfer to one big alloc for easy freeing. */
        ret = malloc(*num * sizeof(char *) + len);
@@ -342,7 +342,7 @@ struct xs_permissions *xs_get_permissions(struct xs_handle *h,
                return NULL;
 
        /* Count the strings: each one perms then domid. */
-       *num = count_strings(strings, len);
+       *num = xs_count_strings(strings, len);
 
        /* Transfer to one big alloc for easy freeing. */
        ret = malloc(*num * sizeof(struct xs_permissions));
@@ -351,7 +351,7 @@ struct xs_permissions *xs_get_permissions(struct xs_handle *h,
                return NULL;
        }
 
-       if (!strings_to_perms(ret, *num, strings)) {
+       if (!xs_strings_to_perms(ret, *num, strings)) {
                free_no_errno(ret);
                ret = NULL;
        }
@@ -376,7 +376,7 @@ bool xs_set_permissions(struct xs_handle *h, const char *path,
        for (i = 0; i < num_perms; i++) {
                char buffer[MAX_STRLEN(domid_t)+1];
 
-               if (!perm_to_string(&perms[i], buffer))
+               if (!xs_perm_to_string(&perms[i], buffer))
                        goto unwind;
 
                iov[i+1].iov_base = strdup(buffer);

diff --git a/tools/xenstore/xs_lib.c b/tools/xenstore/xs_lib.c
index 8630eaffceec55894903d08a34bc61eace354e91..3f4f4b08990eb30eae8f27dc10bd05e5e3a0f9d8 100644 (file)
--- a/tools/xenstore/xs_lib.c
+++ b/tools/xenstore/xs_lib.c
@@ -48,7 +48,7 @@ const char *xs_daemon_transactions(void)
 }
 
 /* Simple routines for writing to sockets, etc. */
-bool write_all(int fd, const void *data, unsigned int len)
+bool xs_write_all(int fd, const void *data, unsigned int len)
 {
        while (len) {
                int done;
@@ -66,7 +66,7 @@ bool write_all(int fd, const void *data, unsigned int len)
 }
 
 /* Convert strings to permissions.  False if a problem. */
-bool strings_to_perms(struct xs_permissions *perms, unsigned int num,
+bool xs_strings_to_perms(struct xs_permissions *perms, unsigned int num,
                      const char *strings)
 {
        const char *p;
@@ -104,7 +104,7 @@ bool strings_to_perms(struct xs_permissions *perms, unsigned int num,
 }
 
 /* Convert permissions to a string (up to len MAX_STRLEN(domid_t)+1). */
-bool perm_to_string(const struct xs_permissions *perm, char *buffer)
+bool xs_perm_to_string(const struct xs_permissions *perm, char *buffer)
 {
        switch (perm->perms) {
        case XS_PERM_WRITE:
@@ -128,7 +128,7 @@ bool perm_to_string(const struct xs_permissions *perm, char *buffer)
 }
 
 /* Given a string and a length, count how many strings (nul terms). */
-unsigned int count_strings(const char *strings, unsigned int len)
+unsigned int xs_count_strings(const char *strings, unsigned int len)
 {
        unsigned int num;
        const char *p;

diff --git a/tools/xenstore/xs_lib.h b/tools/xenstore/xs_lib.h
index a946ab0b199227b6f20166cd5d66f72ba0ec18e1..76ea9b67fe0e2945113f158fc4c0c96ea939e72e 100644 (file)
--- a/tools/xenstore/xs_lib.h
+++ b/tools/xenstore/xs_lib.h
@@ -48,16 +48,16 @@ const char *xs_daemon_store(void);
 const char *xs_daemon_transactions(void);
 
 /* Simple write function: loops for you. */
-bool write_all(int fd, const void *data, unsigned int len);
+bool xs_write_all(int fd, const void *data, unsigned int len);
 
 /* Convert strings to permissions.  False if a problem. */
-bool strings_to_perms(struct xs_permissions *perms, unsigned int num,
+bool xs_strings_to_perms(struct xs_permissions *perms, unsigned int num,
                      const char *strings);
 
 /* Convert permissions to a string (up to len MAX_STRLEN(domid_t)+1). */
-bool perm_to_string(const struct xs_permissions *perm, char *buffer);
+bool xs_perm_to_string(const struct xs_permissions *perm, char *buffer);
 
 /* Given a string and a length, count how many strings (nul terms). */
-unsigned int count_strings(const char *strings, unsigned int len);
+unsigned int xs_count_strings(const char *strings, unsigned int len);
 
 #endif /* _XS_LIB_H */

diff --git a/tools/xenstore/xs_random.c b/tools/xenstore/xs_random.c
index ef5d44d0b059f93b942e4eea4c97f41cfeab3879..675cc89093e886a0ece02a75cf11266aa6d4a913 100644 (file)
--- a/tools/xenstore/xs_random.c
+++ b/tools/xenstore/xs_random.c
@@ -223,10 +223,10 @@ static struct xs_permissions *file_get_perms(struct file_ops_info *info,
                release_file(perms, size);
                return ret;
        }
-       *num = count_strings(perms, size);
+       *num = xs_count_strings(perms, size);
 
        ret = new_array(struct xs_permissions, *num);
-       if (!strings_to_perms(ret, *num, perms))
+       if (!xs_strings_to_perms(ret, *num, perms))
                barf("Reading permissions from %s", permfile);
        release_file(perms, size);
        return ret;
@@ -267,7 +267,7 @@ static bool file_set_perms(struct file_ops_info *info,
        for (i = 0; i < num; i++) {
                char buffer[100];
 
-               if (!perm_to_string(&perms[i], buffer)) {
+               if (!xs_perm_to_string(&perms[i], buffer)) {
                        int saved_errno = errno;
                        close(fd);
                        errno = saved_errno;
@@ -536,7 +536,7 @@ static char *dump_dir(struct ops *ops,
                ret = talloc_asprintf_append(ret, "%s%s: ", spacing, dir[i]);
                for (j = 0; j < numperms; j++) {
                        char buffer[100];
-                       if (!perm_to_string(&perms[j], buffer))
+                       if (!xs_perm_to_string(&perms[j], buffer))
                                barf("perm to string");
                        ret = talloc_asprintf_append(ret, "%s ", buffer);
                }

diff --git a/tools/xenstore/xs_test.c b/tools/xenstore/xs_test.c
index f1e66cbe28eaae629dc1bd5d62044a5012b1af51..74f5e5e64909d241f785fcb070d971bc110514f7 100644 (file)
--- a/tools/xenstore/xs_test.c
+++ b/tools/xenstore/xs_test.c
@@ -153,7 +153,7 @@ static bool write_all_choice(int fd, const void *data, unsigned int len)
 {
        if (fd == -2)
                return write_all_shmem(fd, data, len);
-       return write_all(fd, data, len);
+       return xs_write_all(fd, data, len);
 }
 
 /* We want access to internal functions. */
@@ -491,7 +491,7 @@ static void dump_dir(unsigned int handle,
                printf("%s%s: ", spacing, dir[i]);
                for (j = 0; j < numperms; j++) {
                        char buffer[100];
-                       if (!perm_to_string(&perms[j], buffer))
+                       if (!xs_perm_to_string(&perms[j], buffer))
                                barf("perm to string");
                        printf("%s ", buffer);
                }